hacky lock fix, need to investigate the multiple start/end times