Removed underscores at runtime