fixed issues caused by cc876a5 and 9fb9382