Bug temporary fix for resource fetch