Hopefully fix #542