Could we achieve same thing in a less hacky way?