Workaround, reverberate changes