Close bug #230