attempt to fix masking bug