Fix bug #152 again