Final fix for API edit crash