Merge "Fixing overflow bug"