It is always handled now