Removing lame trick for avoiding #822