Fixed bugs

Move to other branch