#10 - fixing issues