Edit Framework issue fix