same issue we had before, but better code post refactor