Fixed Issue #2 (Base Pointer Fix)