fixed (though it ain't pretty)