This is ugly but this should work now