Fix early drawing bug