Bug fix with default values