bug fix patch contributed by JamesWright
Authored by: pbuchbinder 2015-01-28
Parent: [r141]
Child: [r143]
