Fixed issue #36