Fix st_expand