issue150: fix