change function name to start with s: to be compatible with version 7.4