Gotcha. Yeah we def can't have that block, there are tons of these types of issues in this app and it's hard to fix one in isolation