This is a fix for #59, but it will happen again.