Return by rclick2

moved from #133