Suggested patch for issue #12