Created by: frontsideair
Fixes #1009 (closed) which was merged in [email protected] by @danez.
[email protected]