Remove dependancy on omega - dont ask I dont know why