Working again!
Fixed the bugs introduced on July 30th 2013