Fixed another issue
Almost fixed