fixed stupid hour overlap bug again