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