Issue #550 - Fixed