fixing 2 bugs on 15/07/2013