Fix/#290 type bind

Closes #290. Review by @DarkDimius