Fix handler starter part of code