minor bugs about activity behaviour