Fix for 0009994