fixed for issues #6