Attempt at fixing issue #109