Fixes #1221

@axelstudios @kbenne your guys call if you want to include this in the release or not.