one of final changes
bug fixing