Fixed issues

Issue:

303
296
300
302