[Issue 5] Fixed.