fixed Issue #117 properly (in source dir); added test