Too many calls from 3.15.10.2