fix last FIXME (to be improved)