dev: solved problem2