General fix to framework