Fixed issue #74 (cont).