Fixing bug in configuration property substitution