A hack, that I clean up in later code.