fixed #14
Fixed #24