[Issue 22] Fixed.