Think this should fix my problems