- Fixed bugs

Working