Fixes #924 for 2.14