Added patch provided by fabpot.io