Fixes some repeated unfixing