Added separate fix for multiple resources