Fixed behaviour on startup