Updated according Rasmus suggestions.