Second half of change 42c38335e05a67865a8fec1dacd9ebc6b77d51bd

Required to fix issue #27