Fix recent changes bug