Fixed raw loading when parameters are present