Remove hacky int cast