Fixed issue #1 ;