Fixes last commit with a better solution.