Issue #170 - Fixed.