Added missing check for whether using LCD or not.