Normalize Bugfix!