Well that resolves a few issues