FIX: regression on issue #370 fixed.