Fixed #118 - no more derpy casting :D