Hopefully fix #746