Added #356 as a TODO