Actually fixes #559 :)