No, this should be enough.
There is a chance something broke when I moved onto new architecture. I'll check it.
