ZSS-696: better implementation