fixed shallow issues