bug fixed 06/10/2014