Minor bug #27