Alpha patch for issue #9