Closes #154
Leftover from e1579e69404bb67cc6f120affdbbfb5fdb3d9051