Fixing dependency problem