Temporarily removed chosen references due to bug on master