Should fix a 'cannot measure' bug