rug! fixes issue #18