Maybe we should add this logic?