Fixup reimplementation