fixed #4, #3.