added Fixed issues