[Issue 13] Fixed.