fix: compacter solution