Fixed clear on switch to basic