Fix for 9312