under development fixes issue #2