fixed #262 fixed #261