Fix for Index broken issue