Closes #1748 and Updated Version to 3.0.9