removed serious bug