fixed ticket #21