11-21-14 Fixed by ismail 2