Fixed issue #85, #16