Fixed last merge - untested