Task #69 - Quick fix for masquerade block.