I wanted to fix more stuff in this branch but I've had no luck so this'll have to do for now.
Fixes these two issues: https://cdn.discordapp.com/attachments/446071301325717514/665378234552025109/srb20051.gif https://cdn.discordapp.com/attachments/428262628893261828/670726045892214814/srb20494.gif