Shipyard fix