Fixxed issue #235