Fix strict match with masks