Fixed issue #96.2.