Fixed is_modified handling