fixed github issue 219