fixed #2 and #3