Fixed version of PR #2598

#2598