There needs to be a test for this...