FIX: additional fix for issue #484.