Quick fix for issue rendering bug