Issue 503: Potential Fix