adjusted to clean-up in rofl-core
adjusted to changes in rofl-core ca9e7a4f3241eb0ff9d1a824f9df0ee2bff8a40c