bug fix caused by a shitload of circular import