Closes #542 again