Fix dependency issue that can lead to crash on startup