Fixed:
Issue #8