Issue #153

Fix issue #153.