SAM #56: Fix for Manifestfiles