adjusted to rofl-core commit 3b0aeed4a1596c7147e2f4e3a4c9babf523a8a6b