Quick Fix for label index