Added better request masking

didn't help