GPII-20: adressed remaining comment from @amb26