Added workaround for dependency bug