#1372 Better fix for rem/em issue