Finish fixing the Schrödingbug...