fixup! Changes proposed by bantu