temporary fix for locking