Add patch from 9c5ceb3