Fixes input & custom conversion