Added #1162 in as a TODO