Fix for wrong mask fill-in