This Fixes #1062