fix to adapt change