Buffer Locker Fix