fixing basket bug