Fix this flawed approach