Redo Bill's fix