issue appirio-tech/lc1-project#392 and appirio-tech/lc1-project#465