Fixed invalid handler