this corrects incorrect use of class variables.

- It seems to not break current layouts, fix is needed anyway.