Typecasting fix.
Mismatch return fix.