Sorted out problem with segue registration. Fixes #273