updates #316, #320