Fix for Q589492