Added to previous temporary solution