Issue #582 was fixed sometime during the unstable branch refactoring