some changes for working if
we also need this otherwise it do not work