(hopefully) fixed bug #6.