Fix Unmasking Issue