Hopefully fixed bug #21