Need to improve stability detection