Immutable source problem fix