bug fixes
fix #2