A less load-order-dependent fix