Fixed bug with circular import