Fix issue reported by Rajeev