Workaround issue #93, Fixed issue #90, #89, #88.