A fix for your pull 317