- Fixed unneeded cast-conversion