@glouppe do you know a better way of doing this?