5.0.8 - attempting to fix some bugs in the last commit