Tried again to fix #5 ...