Clear not working correctly - needs work