Issue #310