Fixes #2016 (closed)
@svornost
I fucked this up last time, I'm pretty sure. Is everything good this time?