Adjusted to sopremo rc-0.4