Application cotroller fix