Partial fix for neverending runs