Fixed the empty label bug again