Correcting mistakes. Attempt #2

Details
-------

Ticket
------