resolve issues #52