Fix Rickard2