Fix annoying shit