Bugfix - dependency issue