Unlocker fix