Hopefully fix #3 and fix #4