Fixed mistakes caused by using IntelliJ refactor. Woops.