Feature/frans fix