Further fix for new hkgolden layout