Removed cyclic dependency for #26