Removed excess converting.