This Fixes #1039