One more TODO due to @Lambo16's request