issues fixed #2