Fixed BUgs