This Fixes #766,#1062