Merge in bug fix for for MTaylor