Corrected the block bug!Probably needs a rewrite based on RBParseTreeRewriter