Fix bug #11