Found bug, maybe fix?