Fix towards current framework