[Issue #56] Correction for backwards compatibility on Context startup