Fix github issue