Fixed issue with default variables being blank