try to solve @killer bug