Issue#1 solve