Another abolish fix