Issue fixed, more changes to follow