Fix bug #334