clean up, should fix #1