Fixes #16 and fixes https://github.com/Daniel-Mietchen/OA-signalling/issues/75