FIX: issue #357 (Issue #342 has returned)