removed 2.8.0rc1 code due to issue