add it to joker and fix #84