fixed issues assignment #11