FIX: additional fix for issue #407.