Attempt at fixing issue #576.