#11: Fixed issues