Closes issue #1773
Updated Version 3.0.9.007