This is a fix for #2