Fix #136: Enhance assets override better from AssetManager