Fixes issue with basket and spontanous errors