Fix for assumptions someone in fivepoints is making