Apply ticket #117