Implement a fix for #465