This Fixes #766