added temporary clip support solution