implemented fixups