bugfix reference to issue#9 and issue#11