another attempt to solve this issue :)