Hopefully fix #4