Made new and old fixes work side by side