fixxed issue #1