Hopefully fix #371?