Fixing implicit conversion