Fixed bug with deferal