Same optimizations as with other one