Added email some bug fix