Minor modification for optimizations