fix to adapt 6.0