[#68] fixed bugs