Hopefully fix bugs