That should be probably removed, but not sure how to handle that