Adaptive design fix