Minor modification for potentially better speed