These changes are buggy. Need a fix