Last resort, trying to get rid of dependency issue.