fixed GitHub issue #25