Better **/ handling