funny, I cpy&paste from CLI handler. So I can fix it also there