Issue #320 #318 #322