Added fix for building Handler