Fixed handler script