LQ : For fixing Bugs. 8 and 9.