Fixed dependency issue 2nd try