Debugging and label fix