Issue #32 - Fixed