Fix for devise-two-factor and lockable bug

Question

I am having some issues with normal Devise lockable not behaving the way it should (incrementing the failed_attempts counter by 2 instead of 1, for every invalid password). I suspect it could be because of the additional OTP prompt that I have added using devise-two-factor gem for two factor authentication. Apparently, its a known bug and there are no easy fixes found so far. link for 2FA gem bug. Has anyone found any work around or gone on to create their own lockable features instead of using the standard devise lockable. Any clues or leads will be super helpful. Thanks.