Fixes #2783

#2783