Fixed #2314. Backend SHA: d77cb1a474cf86978f02ce125c18d24c97f55049
* Same as last few commits, I just forgot to include it in the comment.