Added potential fix for render bugs