remove prefix for more flexibility