fixed issues #175, #176