Applied workaround in other projects, too.