Fixed issue raised by Sahil