Fix - substring plain correctly