SN-33, SN-40 Fix bugs