FIX: additional fix for issue #416.