#129 bug fixed