closes #758 and work on #762