* fixed solution