Bug fix: Clear not working as intended