- fixed #1, #2, #3