Fixing dependency issue