Really fixed bug #12 this time.