This Fixes #1045