Added workaround for dependency problems.