try to fix these damn handler