This Fixes #1028