bug need fixes