Close bug #134