Fix the bug and make it compatible with latest javazab.