This will hopefully be the last bugfix before 0.9