Fix creator crash