More debugging for #619