Issue #95 double render fix