Support proxy objects to fix #34