A more appropriate solution