Shame on me, previous commit is buggy