Application controller fix