Hopefully fixed bug #7