Fixed issue #87, #91