More appropriate solution