Fixed dependency resolving.