fixed issues #1