Fix for issue RI-17