Fix for issue #248 perhaps?