fixed ticket #24