Pushed fix for issue #2