issue #1015 have to do objects too