Fixing Bug on set split