fix for v. 2.15