Fixed bug 132 (part 2)