jrcportal #974 - fix resource handling