Lasting fix (9/18)

Lasting fix