fix compatibility with old handler + fixes