fix typecasting of undefineds
2.1.5