Added workaround for ST bug.