Fixed x-overflow