fixed errors #2 and #3