time conflicts?
fixed issues #49
fixed issue #49