Fixed issues (2/15)

Fixed issues