I'll commit it via other pull-request without "first -> object" modifying.