Merge pull request #2410 from steffen-kiess/fix-monop