fixes #902
fixes #904 #903