Fix for issue n. 718