Fixed non-conversion errors