lock removed to avoid deadlock.
problem observed on id21 with deeply nested calc controllers ; would be good to have a test before merging
Edited by Matias Guijarro
problem observed on id21 with deeply nested calc controllers ; would be good to have a test before merging