Fixes Issue #43 reported by Hsidhu