Fixed issues

Issue:

303
296