fixed for pr comments