Fixed Github issue