Fix rendering performancem, fixes #223