Too many calls from 3.16.24.18