Alexander, fixes #526