More work on Issue #316