I wonder how to make this less fragile?