Lasting fix (8/18)

Lasting fix