Attempt at a bugfix. Test2