Scratch the last commit, 3.6 isn't good enough