Fixed unchecked conversion