Fix activeLock bug