Added workaround for dependency problem