Hopefully fixing a poignant bug... (2/2)