Fixes #658

muh gramer