Small Fix+Optimize