Beamer needs to work on this