bugs fixed #2