Fixxed issue #289