- By Benjamin. Bug fix for 2704.