Oh ffs, this bug is still in there