Fix wrong dashboard behaviour