important bug fixed