Fix bonus tricks broken by the previous commmit