Completed ticket #17