PKMR-2: Fixed return value :I