Fixed issue introduced by #300.
Merge pull request #310 from pelson/fix_merge_bug

Fixed issue introduced by #300.