RP-132 Fix overflow