A bit more flex fixing