Attempt at fixing issue #17