Bug fix for quirky behavior.