fixed for issues #7