Fixed bug with double mapping