Pushed fix for issue #1