Fix for increment order