Fixing resource clash