fix the issues feedback from vlad