Fix bug #144