Fix for issue #19 (sort of)