Fixed integer conversion from previous commit