Fixed issue reported by Akash Lal.