Fix issues (13/14)

Fix issues