Optional portable framework fix