Potentially Fix issue #37