fix BUG, update to 1.2