# Caption placement for figure on the right

I often want to place figures on the right and let the text flow around it using wrapfig. For small figures this is nearly always an issue because the caption will be smushed together and extend over textwidth edge. Is there any way to fix this (e.g. maybe place it under Fig.)?

\begin{wrapfigure}{r}{0.13\textwidth}
\vspace{-25pt}
\begin{center}
\includegraphics[width=0.13\textwidth]{img/.../sdf_layerAndFileFormat.png}