Make this a bit more sound