Fixes issue #361

closed #361