Fixed Safe Rendering - CLOSES #2