quick fix, fixed issue #16