type protection fixes #14 ?