(Fixed what Eclipse managed to mangle...)