New Version fix bug