fixed compatibility issues with manifest version 2 for #26