Unlocker fix III