Minor fix for issue#466

Also see ABU-309
Merge pull request #486 from dancgray/feature/309

Minor fix for issue#466