Fixed #1. Thanks, Martin Mahner and Jannis Leidel.