2.03.0:zeress:12 Issue #49 Partial Fix Pt. 3