fixed #5 fixed #4