Fix problem with companies loader logic