Fixes infinity for 1.8.7