Cover locked issue #95 (refactored)