12-03-14-v3-isotope fix by ismail