Workarounds - there is an unhandled SIGSEGV in this commit