This should no longer be necessary