Fixes #544, optimize normalize by not setting up map default