Fixed #257 - no more derpy casting