fix bugs from last commit
#10