Usergrid 2862 limitfix