Actually #24 was still buggy; think it's actually fixed now