Fixed issues #762 #758, #754