Fix loading of resources
Release 2.0.7