some vodoo, need to change