Fixed an issue, hopefully