Fixes breaking changes in nightly

Closes #688
Merge pull request #689 from leonkunert/master

Fixes breaking changes in nightly