Move fix to common