Hopefully fix #3