Fixed #2 by using the suggestion.