fixed issues caused by previous fix