Bug Fix Edit Event