Fixed dependency problem caused by pull request #3482