Fixed bug refs #2070