Fixed broken handler