Moved MapExtensions
Fix for error message