attempt at locking fix, blind checkin