On that note, should there be a test for this?