Fixed merge issue, not to be deleted yet