refs #2674: Test and fix for the bug