Fix dependencies
Stupid to make this a unique field