try and fix circular dependenct bug