Trying to fix my fork