Resolve dependency problem