Issue #318