fix #7 and resolve last commit problems again