Merge pull request #814 from ranma42/fix-monop