Possible fix for few bugs

Printable View