Additional fix for unused property