Hello everybody!

I had a report of a crash and so I decided that I would just update/rewrite the code to make sure there wouldn't be any more problems as I couldn't replicate the original issue ( I did however find another crash).

Let me know if there are any issues with this new file, thank you.