Move workaround calls to new function o app class.