minor performance improvement, better workaround for clang issue with handle property