Fixed recent changes