issue #1 fixxed