PWF fix

thx to cuteones function