Fixed github issue 63