Added workaround in post pass for Stratosphere Issue #206