Quick fix for maximum call size exceeded