Fixes #623 - this needs to be done for many more elements