We should add this as an issue as well