Add working again under bootstrap