Removed if statement because I think it's causing rendering problems