Small fix to framework