attempt at fixing issue #8