Fix for exception
Fix for array access and map access