Fixed bug where dev branch version 5.21 or above don't work