Strange bug in last commit