compiled version of PR #107