Rubio, fixes #187