Fix for issues/1595