Fixing dependency bug