Fixes #527 and makrohn/polymorphable#36