Fixed bug in raw input map