fixing issues #2