Fixed implicit conversion breaking everything