Probably fix #1415