Fix for multiplying calls?