Fixed EVEN MORE!!! DO NOT CHANGE!!!