#15: few implementation fix