Fixed the last bug I have been made aware of