Fix bug #146