Implicit-cast fix