Bug fixes #time 10m