This is a bug fix to support a few customers