pre-merging Dani's ramble creation fix