We should figure out a better way of handling this scenario...