Fix for the bug in Generic platform library in RM