Fix for issue #144 in http://git.io/j629ig