WIP
fixes #3001