Fix for Dependency on non-existent parameters error

Closes #7