Fixing rendering issue