Without dependencies it works! Bug fixes