rrrlw fixes #21