Fix for dynamic / static part of calibration