This Fixes #754,#755,#656,#828