More fixing previous commits' code...