V2.1

White screen fix