Added mapping off and objects in array