Clean commit to fix bug #1674