I think the bug is worked out, but requires more testing