#16 rultor fix