Fixes #2674

#2674