Change default values to avoid forcing undefined