Fixed Bug with Map