fixed basket issues