fixed important bug