Another attempt at fixing issue #71