Added workaround for Kilipsjärvi