Workaround for scheduler crashing

The solution used in #470 (closed) didn't work. So a workaround of the problem triggered has to be implemented.