Major Bug Fix Patch - v2.0.1