Hopefully a better fix for the previously mentioned issue.