Issue #537 IllegalOperationError package fix