Hopefully fix #279.