Hopefully fix bug for realz