Tested PR for #485. Had a hard time squashing this, maybe because I did a merge in between. Sorry about that!