Comment out special case