Removed weird conversion