2.03.0:zeress:13 Issue #49 Partial Fix Pt. 4