fixed #4 and fixed #5