fixed issues #22