Minor improvement to earlier #412 fix