Fixed draw order issues after jumping to another system