Unlocker fix II