bugfix  Issue #15