Fixes #67 - really ugly; needs rework!
Polish fix #67; now creates error as in #58 (will fix next)