added ticket #36