The bug is (almost) fixed