Fix from nananas. Closes #300