FIX: Integer overflow with previous fix