Fix for processing manifest with spaces