Adaptation fix