fixed to issues #4