Andrew "Fixed employee check lost in merge"