This should work.. for now.