Double Buffering Fix