Fixes issue #247 and #252; yeyy; Is this too dirty?