Fix #547 for non available task runs