Fixed filling dependencies.
Merge remote-tracking branch 'tchief/master'