Fix invocations are now done on main thread