This needs to be addressed...